Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

More flexible invites #265

Closed
wants to merge 5 commits into from
Closed

More flexible invites #265

wants to merge 5 commits into from

Conversation

benlangfeld
Copy link
Member

  • Does not discount the possibility that an invite message also has a <body/> that we should display normally
  • Optimises element searches
  • Supports invites to password protected rooms
  • Supports invites as a continuation of 1-on-1 threads
  • Supports XEP-0249 direct invitations, as well as mediated invites from XEP-0045

/cc @bklang @melissanoelle

@malakada
Copy link
Member

@mweibel

@benlangfeld
Copy link
Member Author

So, the first commit here breaks the libs bundle, apparently removing Strophe.js. Does anyone know why this would be?

@benlangfeld
Copy link
Member Author

Answering myself on the above point, it appears that running grunt does this, but grunt watch does not.

@benlangfeld
Copy link
Member Author

Indeed the specific task that does this is uglify:libs, and this is because minified versions of libs are (unlike Candy) not checked in to source control, but rather generated on release.

@mweibel Could you possibly explain why Candy checks these generated artifacts in to source control? I don't see the motivation documented.

For now I'll fix this by just rebasing out the changes to libs/ in these commits.

@benlangfeld benlangfeld changed the title Feature/more flexible invites More flexible invites Jul 10, 2014
@mweibel
Copy link
Member

mweibel commented Jul 11, 2014

Will have a look on the PR soon.

@libs question: yeah this is a somewhat bad thing we have since the beginning. We use submodules (which are bad & really complex to handle anyway) for the libs/* folders and not something like bower/npm (now that I think about it, we might be able to switch to it at some point). And in the specific case of strophe, they don't check in the generated file to source control & therefore you need to manually go into the strophe folder & run make (or grunt now)

@mweibel
Copy link
Member

mweibel commented Jul 11, 2014

Awesome PR. I made some changes to the variable naming (preferring camelCase over snake_case) but otherwise it looks good. Also it's related to candy-chat/candy-plugins#16

mweibel added a commit that referenced this pull request Jul 11, 2014
@mweibel
More flexible invites.
ef6ffe4 
Also supportes now continued invites :)

Fixes #265
Relates candy-chat/candy-plugins#16

commit f5a751cfc78f4db2b5e02fd8b4da070a88e30d56
Author: Michael Weibel <[email protected]>
Date:   Fri Jul 11 07:56:18 2014 +0200

    Fix naming

commit 72dbba4
Author: Ben Langfeld <[email protected]>
Date:   Thu Jul 10 11:18:02 2014 -0300

    Support XEP-0249 Direct MUC Invitations

commit c263dee
Author: Ben Langfeld <[email protected]>
Date:   Thu Jul 10 11:04:15 2014 -0300

    Support invites as a continuation of a 1-on-1 thread

commit 85907cb
Author: Ben Langfeld <[email protected]>
Date:   Thu Jul 10 10:58:04 2014 -0300

    Support room passwords in MUC invites

commit bc2fa19
Author: Ben Langfeld <[email protected]>
Date:   Thu Jul 10 10:20:48 2014 -0300

    No need to look for this over and over

commit 1532df3
Author: Ben Langfeld <[email protected]>
Date:   Thu Jul 10 10:10:18 2014 -0300

    A mediated invite might be included in a normal message
@mweibel mweibel closed this Jul 11, 2014
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@benlangfeld @malakada @mweibel